From f6f6a2a4b01fa942f051a93d539825fd4a38d59b Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 28 Jan 2008 13:01:01 +0000 Subject: [PATCH] gtk/gtktextchild.c use G_STRLOC instead of G_GNUC_FUNCTION (which is 2008-01-28 Michael Natterer * gtk/gtktextchild.c * gtk/gtktextview.c: use G_STRLOC instead of G_GNUC_FUNCTION (which is deprecated now). svn path=/trunk/; revision=19416 --- ChangeLog | 6 ++++++ gtk/gtktextchild.c | 28 +++++++++++++++------------- gtk/gtktextview.c | 4 ++-- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index b83e493bfc..6126ed12c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-01-28 Michael Natterer + + * gtk/gtktextchild.c + * gtk/gtktextview.c: use G_STRLOC instead of G_GNUC_FUNCTION (which + is deprecated now). + 2008-01-26 Johan Dahlin * tests/Makefile.am: diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c index c952d4c1eb..04adddad30 100644 --- a/gtk/gtktextchild.c +++ b/gtk/gtktextchild.c @@ -55,21 +55,23 @@ #include "gtkintl.h" #include "gtkalias.h" -#define CHECK_IN_BUFFER(anchor) \ - G_STMT_START { \ - if ((anchor)->segment == NULL) \ - { \ - g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", G_GNUC_FUNCTION); \ - } \ +#define CHECK_IN_BUFFER(anchor) \ + G_STMT_START { \ + if ((anchor)->segment == NULL) \ + { \ + g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet",\ + G_STRLOC); \ + } \ } G_STMT_END -#define CHECK_IN_BUFFER_RETURN(anchor, val) \ - G_STMT_START { \ - if ((anchor)->segment == NULL) \ - { \ - g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", G_GNUC_FUNCTION); \ - return (val); \ - } \ +#define CHECK_IN_BUFFER_RETURN(anchor, val) \ + G_STMT_START { \ + if ((anchor)->segment == NULL) \ + { \ + g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet",\ + G_STRLOC); \ + return (val); \ + } \ } G_STMT_END static GtkTextLineSegment * diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index d823e3115a..5f18ec01ea 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -8102,12 +8102,12 @@ gtk_text_view_get_window (GtkTextView *text_view, break; case GTK_TEXT_WINDOW_PRIVATE: - g_warning ("%s: You can't get GTK_TEXT_WINDOW_PRIVATE, it has \"PRIVATE\" in the name because it is private.", G_GNUC_FUNCTION); + g_warning ("%s: You can't get GTK_TEXT_WINDOW_PRIVATE, it has \"PRIVATE\" in the name because it is private.", G_STRLOC); return NULL; break; } - g_warning ("%s: Unknown GtkTextWindowType", G_GNUC_FUNCTION); + g_warning ("%s: Unknown GtkTextWindowType", G_STRLOC); return NULL; } -- 2.30.2